From 5ec7e643fc83df61d68ab4b3a60ce3093e25ec6a Mon Sep 17 00:00:00 2001 From: Rob Browning Date: Sun, 29 Jul 2007 19:22:17 -0700 Subject: [PATCH] Fix control file for binary NMUs. --- debian/changelog | 7 +++++-- debian/control | 10 +++++----- debian/control.in | 10 +++++----- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 84a56685002..1bb09538f4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ emacs22 (22.1+1-2) unstable; urgency=low * Fix mail locking patch for Debian's non-Linux architectures. Thanks - to Michael Banck . (closes: #433816) [rlb] + to Michael Banck . (closes: #433816) [rlb] - -- Rob Browning Sun, 29 Jul 2007 19:04:00 -0700 + * Fix control file for binary NMUs. Thanks to Lior Kaplan + . (closes: #432957) [rlb] + + -- Rob Browning Sun, 29 Jul 2007 19:21:20 -0700 emacs22 (22.1+1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index b4ae54a2c90..fddfde9f1d0 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,7 @@ Package: emacs22 Section: editors Priority: optional Architecture: any -Depends: emacs22-bin-common (= ${Source-Version}), ${shlibs:Depends} +Depends: emacs22-bin-common (= ${binary:Version}), ${shlibs:Depends} Provides: emacsen, editor, info-browser, mail-reader, news-reader Suggests: emacs22-common-non-dfsg Conflicts: emacs22-nox, emacs22-gtk, w3-el @@ -33,7 +33,7 @@ Package: emacs22-nox Section: editors Priority: optional Architecture: any -Depends: emacs22-bin-common (= ${Source-Version}), ${shlibs:Depends} +Depends: emacs22-bin-common (= ${binary:Version}), ${shlibs:Depends} Provides: emacs22, editor, emacsen, info-browser, mail-reader, news-reader Suggests: emacs22-common-non-dfsg Conflicts: emacs22, emacs22-gtk, w3-el @@ -46,7 +46,7 @@ Package: emacs22-gtk Section: editors Priority: optional Architecture: any -Depends: emacs22-bin-common (= ${Source-Version}), ${shlibs:Depends} +Depends: emacs22-bin-common (= ${binary:Version}), ${shlibs:Depends} Provides: emacs22, editor, emacsen, info-browser, mail-reader, news-reader Suggests: emacs22-common-non-dfsg Conflicts: emacs22, emacs22-nox, w3-el @@ -59,7 +59,7 @@ Package: emacs22-bin-common Section: editors Priority: optional Architecture: any -Depends: emacs22-common (= ${Source-Version}), ${shlibs:Depends} +Depends: emacs22-common (= ${source:Version}), ${shlibs:Depends} Description: The GNU Emacs editor's shared, architecture dependent files GNU Emacs is the extensible self-documenting text editor. This package contains the architecture dependent infrastructure @@ -81,7 +81,7 @@ Package: emacs22-el Section: editors Priority: optional Architecture: all -Depends: emacs22-common (= ${Source-Version}) +Depends: emacs22-common (= ${source:Version}) Description: GNU Emacs LISP (.el) files GNU Emacs is the extensible self-documenting text editor. This package contains the elisp sources for the convenience of users, diff --git a/debian/control.in b/debian/control.in index c7f14cb0eed..c6dd1b0bd26 100644 --- a/debian/control.in +++ b/debian/control.in @@ -21,7 +21,7 @@ Package: @DEB_FLAVOR@ Section: editors Priority: optional Architecture: any -Depends: @DEB_FLAVOR@-bin-common (= ${Source-Version}), ${shlibs:Depends} +Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends} Provides: emacsen, editor, info-browser, mail-reader, news-reader Suggests: @DEB_FLAVOR@-common-non-dfsg Conflicts: @DEB_FLAVOR@-nox, @DEB_FLAVOR@-gtk, w3-el @@ -33,7 +33,7 @@ Package: @DEB_FLAVOR@-nox Section: editors Priority: optional Architecture: any -Depends: @DEB_FLAVOR@-bin-common (= ${Source-Version}), ${shlibs:Depends} +Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends} Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader Suggests: @DEB_FLAVOR@-common-non-dfsg Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-gtk, w3-el @@ -46,7 +46,7 @@ Package: @DEB_FLAVOR@-gtk Section: editors Priority: optional Architecture: any -Depends: @DEB_FLAVOR@-bin-common (= ${Source-Version}), ${shlibs:Depends} +Depends: @DEB_FLAVOR@-bin-common (= ${binary:Version}), ${shlibs:Depends} Provides: @DEB_FLAVOR@, editor, emacsen, info-browser, mail-reader, news-reader Suggests: @DEB_FLAVOR@-common-non-dfsg Conflicts: @DEB_FLAVOR@, @DEB_FLAVOR@-nox, w3-el @@ -59,7 +59,7 @@ Package: @DEB_FLAVOR@-bin-common Section: editors Priority: optional Architecture: any -Depends: @DEB_FLAVOR@-common (= ${Source-Version}), ${shlibs:Depends} +Depends: @DEB_FLAVOR@-common (= ${source:Version}), ${shlibs:Depends} Description: The GNU Emacs editor's shared, architecture dependent files GNU Emacs is the extensible self-documenting text editor. This package contains the architecture dependent infrastructure @@ -81,7 +81,7 @@ Package: @DEB_FLAVOR@-el Section: editors Priority: optional Architecture: all -Depends: @DEB_FLAVOR@-common (= ${Source-Version}) +Depends: @DEB_FLAVOR@-common (= ${source:Version}) Description: GNU Emacs LISP (.el) files GNU Emacs is the extensible self-documenting text editor. This package contains the elisp sources for the convenience of users, -- 2.30.2